Merge commit 'upstream/1.3.6'

Conflicts:

	Makefile.in

diff --cc xmldoc/babelmain.xsl
index 9f791bd64cde0e073d4a616b727d8e29406a4a94,132c2f9e0d00a6a907d0c0e8079f641216d80095..cc42029edc65f7edc79ee864bd0722327399b2ba
--- 1/xmldoc/babelmain.xsl
--- 2/xmldoc/babelmain.xsl
+++ b/xmldoc/babelmain.xsl
@@@ -4,9 -4,8 +4,8 @@@
                  exclude-result-prefixes="exsl">
  
  
 -<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/chunk.xsl"/>
 +<xsl:import href="file:///usr/share/xml/docbook/stylesheet/nwalsh/xhtml/chunk.xsl"/>
  
- <xsl:param name="html.stylesheet">http://www.gpsbabel.org/style3.css</xsl:param>
  <xsl:param name="use.id.as.filename">1</xsl:param>
  <xsl:param name="chunk.first.sections">1</xsl:param>
  <xsl:param name="toc.section.depth">1</xsl:param>